Autogenerated HTML docs for v1.8.2-230-g2bba2
diff --git a/git-sh-setup.txt b/git-sh-setup.txt index 6a9f66d..5d709d0 100644 --- a/git-sh-setup.txt +++ b/git-sh-setup.txt
@@ -82,6 +82,12 @@ outputs code for use with eval to set the GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL and GIT_AUTHOR_DATE variables for a given commit. +create_virtual_base:: + modifies the first file so only lines in common with the + second file remain. If there is insufficient common material, + then the first file is left empty. The result is suitable + as a virtual base input for a 3-way merge. + GIT --- Part of the linkgit:git[1] suite
